Merge
authorAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 16:09:04 +0000 (16:09 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 16:09:04 +0000 (16:09 +0000)

Trivial merge